Remove use of deprecated g_type_init () ...

... and bump GObject requirement accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=686318

diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c
index b47b41c0e17a4ebb5b0259147bdcfcd8059aee8d..9677789485b859316e6965773ef31ab508f7766a 100644 (file)
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -153,8 +153,6 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
   /* global initialization routine, called once when plugin
      is loaded */
 
-  g_type_init ();
-
   g_debug ("plugin loaded");
 
   memcpy (&funcs, pfuncs, sizeof (funcs));

diff --git a/configure.ac b/configure.ac
index 41bbd67f2570a9c223ed44f5e81b47338922b101..73ce9f52911458e0ca17a10f8216d827a18358cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
 MUTTER_MIN_VERSION=3.6.1
 GTK_MIN_VERSION=3.3.9
-GIO_MIN_VERSION=2.31.6
+GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 LIBEDATASERVERUI_MIN_VERSION=3.5.3

diff --git a/src/hotplug-sniffer/hotplug-sniffer.c b/src/hotplug-sniffer/hotplug-sniffer.c
index 31b743d907739e89a3c6a0b12a4493fc42f833b2..af3a4c2fc245874062c0f8f62159be1f43e2ec7a 100644 (file)
--- a/src/hotplug-sniffer/hotplug-sniffer.c
+++ b/src/hotplug-sniffer/hotplug-sniffer.c
@@ -240,8 +240,6 @@ main (int    argc,
 {
   guint name_owner_id;
 
-  g_type_init ();
-
   introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
   g_assert (introspection_data != NULL);
 

diff --git a/src/main.c b/src/main.c
index 001a91a5734f1669d553338e8d8de9dc08481992..a0cf0dca1e5090f25ca8cd3357930d14f13dffea 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -361,8 +361,6 @@ main (int argc, char **argv)
   int ecode;
   TpDebugSender *sender;
 
-  g_type_init ();
-
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);

diff --git a/src/run-js-test.c b/src/run-js-test.c
index 894e2b67ac060606d9cd477fa7182da697bc52e1..84c1d26d251fee12abad268121d0476239851d4a 100644 (file)
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -92,7 +92,6 @@ main(int argc, char **argv)
     g_error ("option parsing failed: %s", error->message);
 
   setlocale (LC_ALL, "");
-  g_type_init ();
 
   _shell_global_init (NULL);
   global = shell_global_get ();